Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

using allocator for bson #4167

Open
wants to merge 21 commits into
base: develop
Choose a base branch
from

Conversation

alexfishgait1234
Copy link

@alexfishgait1234 alexfishgait1234 commented Sep 29, 2023

[Describe your pull request here. Please read the text below the line, and make sure you follow the checklist.]

we need some json functionality completely without any memory allocations. That means passing allocators als template parameter to different classes: parser,binary_reader,inputadapter,sax_dom_parser,lexer.
json functions that need to use custom memory allocator: to_bson;from_bson;parse.
Some std containers in lib are not allocator aware:
-std::vector<char_type> token_string - lexer
-std::vector<BasicJsonType*> ref_stack - json_sax.hpp
we need 2 types of allocator as template parameter : basic_json* and char_type(char)
there are also make_shared ptr in output adapter which should be replaced with allocate_shared.
some other minor conversions functions which allocate.

usage from our client code will be as follows:
namespace rtjson {
using json = nlohmann::basic_json<std::map,
std::vector,
sqp::core::rtutils::RtString, //use rtstring
bool,
long long,
unsigned long long,
double,
sqp::core::memory::PolymorphicAllocator, //use polymorpic allocator

                              nlohmann::adl_serializer>;

} // namespace ext

using json = rtjson::json;

Pull request checklist

Read the Contribution Guidelines for detailed information.

  • Changes are described in the pull request, or an existing issue is referenced.
  • The test suite compiles and runs without error.
  • Code coverage is 100%. Test cases can be added by editing the test suite.
  • The source code is amalgamated; that is, after making changes to the sources in the include/nlohmann directory, run make amalgamate to create the single-header files single_include/nlohmann/json.hpp and single_include/nlohmann/json_fwd.hpp. The whole process is described here.

Please don't

  • The C++11 support varies between different compilers and versions. Please note the list of supported compilers. Some compilers like GCC 4.7 (and earlier), Clang 3.3 (and earlier), or Microsoft Visual Studio 13.0 and earlier are known not to work due to missing or incomplete C++11 support. Please refrain from proposing changes that work around these compiler's limitations with #ifdefs or other means.
  • Specifically, I am aware of compilation problems with Microsoft Visual Studio (there even is an issue label for this kind of bug). I understand that even in 2016, complete C++11 support isn't there yet. But please also understand that I do not want to drop features or uglify the code just to make Microsoft's sub-standard compiler happy. The past has shown that there are ways to express the functionality such that the code compiles with the most recent MSVC - unfortunately, this is not the main objective of the project.
  • Please refrain from proposing changes that would break JSON conformance. If you propose a conformant extension of JSON to be supported by the library, please motivate this extension.
  • Please do not open pull requests that address multiple issues.

@github-actions
Copy link

🔴 Amalgamation check failed! 🔴

The source code has not been amalgamated. @alexfishgait1234
Please read and follow the Contribution Guidelines.

@coveralls
Copy link

Coverage Status

coverage: 100.0%. remained the same when pulling cf81aa7 on swissQprint:feature/afi/RtBson into fac07e2 on nlohmann:develop.

@gregmarr
Copy link
Contributor

@alexfishgait1234 You made your changes in the single_include file, which is generated from the individual files in the include directory. You need to change the individual files and then update the single_include version using make amalgamate.

@alexfishgait1234 alexfishgait1234 marked this pull request as draft September 29, 2023 15:26
Copy link
Owner

@nlohmann nlohmann left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  • Please amalgamate.
  • Please add a proper description of the changes. Why are they needed? What is the benefit?
  • Please add a test case using the allocator and the string type.

@alexfishgait1234
Copy link
Author

alexfishgait1234 commented Sep 29, 2023 via email

@github-actions
Copy link

github-actions bot commented Oct 4, 2023

🔴 Amalgamation check failed! 🔴

The source code has not been amalgamated. @alexfishgait1234
Please read and follow the Contribution Guidelines.

@github-actions github-actions bot added L and removed M labels Oct 9, 2023
@alexfishgait1234
Copy link
Author

how can i remove single_include/hnohmann/json.hpp from pull request please?

@alexfishgait1234 alexfishgait1234 marked this pull request as ready for review October 9, 2023 08:52
@github-actions
Copy link

github-actions bot commented Oct 9, 2023

🔴 Amalgamation check failed! 🔴

The source code has not been amalgamated. @alexfishgait1234
Please read and follow the Contribution Guidelines.

@github-actions github-actions bot added the tests label Oct 9, 2023
@github-actions
Copy link

github-actions bot commented Oct 9, 2023

🔴 Amalgamation check failed! 🔴

The source code has not been amalgamated. @alexfishgait1234
Please read and follow the Contribution Guidelines.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants